From e2c3c2e461bb74b40aae2a63528bcb664bbde28c Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Sat, 21 May 2005 10:41:06 +0000 Subject: [PATCH] bitkeeper revision 1.1503 (428f1042Yao-1v9mZSxNem0DoJz-Yw) Fix show_registers() show guest stack or Xen stack, not both. Signed-off-by: Keir Fraser --- xen/arch/x86/x86_32/traps.c | 3 ++- xen/arch/x86/x86_64/traps.c | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/x86_32/traps.c b/xen/arch/x86/x86_32/traps.c index 0e391a4ea6..2070c8a49d 100644 --- a/xen/arch/x86/x86_32/traps.c +++ b/xen/arch/x86/x86_32/traps.c @@ -78,9 +78,10 @@ void show_registers(struct cpu_user_regs *regs) "ss: %04lx cs: %04lx\n", ds, es, fs, gs, ss, cs); - show_stack((unsigned long *)®s->esp); if ( GUEST_MODE(regs) ) show_guest_stack(); + else + show_stack((unsigned long *)®s->esp); } void show_page_walk(unsigned long addr) diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c index ae9cf424c2..4bd093a1da 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -23,10 +23,11 @@ void show_registers(struct cpu_user_regs *regs) printk("r12: %016lx r13: %016lx r14: %016lx r15: %016lx\n", regs->r12, regs->r13, regs->r14, regs->r15); - show_stack((unsigned long *)regs->rsp); if ( GUEST_MODE(regs) ) show_guest_stack(); -} + else + show_stack((unsigned long *)regs->rsp); +} void show_page_walk(unsigned long addr) { -- 2.30.2